auto merge of #791 : alexcrichton/cargo/update, r=alexcrichton
authorbors <bors@rust-lang.org>
Sat, 1 Nov 2014 19:29:48 +0000 (19:29 +0000)
committerbors <bors@rust-lang.org>
Sat, 1 Nov 2014 19:29:48 +0000 (19:29 +0000)

Trivial merge